Application Layout

Refactoring main application view layout