slight changes and bug fix on back and cancel buttons
end saturday commit