reworked layouts, added site settings
merged