Added back buttons, WIP layout for change + new PW