Fixed some issues and the layout