Updated layouts and added classes for different screens