Bug fixes and App refactoring