Lots of changes to reduce the number of display layers, hoping to reduce memory issues on mobile devices