added new layouts
removed merged conflicts