Fixed Height Issues

(Actual Commit)