updated layouts and some styles