Updated main layouts