Switching between layouts
Fixed conflicts