Rework of app layout.