Styling & improving the layout