Adding better support for smaller screens