cleaned up height issues