Added new layouts as well as support for various screen sizes