Fixed the layout and styles