Refactor application layout

make application layout more readable