Language, Theme, Password - Margin fix