fixed issue where expand/collapse of sidebar takes two clicks
GCP-9305
changed Change Password window layout
GCP-8936