Settings, Home, polish & bugfix