Rework app layout