Updated and simplified default layouts