Add helper for application layout
Merge branch 'hung'