Merge "Minor update on login form on layout and buttons"