updated layouts and formats