updated layouts, changed style