Cleanup and improve phone support for smaller screens