#31 application layout fixed