Added support for small screens
Added support for x-large screens