updated layouts and views