Updating css and layout
Improving app logic