Fixed 5 more layouts