Fixed cancel buttons, add active state to Dashboard