Fixed some height issues