fixed layouts
merged differences with Development