Fixed a few diplay issues on small screens