Fixed some layaout issues