App: changed layout

App: changed layout