Updated layouts for different screen size