UI changes - (hopefully) fixing problems with any height