Added more layouts, courtesy of @Le-Che