Fixed the layout issues