Fixed some issues with the layout