updated layouts to fit in screen