General improvements and preparing for small screens