New layouts
merged new design with preferences