Height and Overflow Fix