UI-121 updates to buttons