Fixed some small issues with layout