updated layouts and styling