prettify the application layout code
Revert "prettify the application layout code"

This reverts commit fd563a03d04139c7d7b57dede514c14a3e60e590.
Revert "Revert "prettify the application layout code""

This reverts commit feefd8fe8bb443f66e19e710d94deecb63e31c31.