Fixed the layout