more styles cleanup. Moved Save/Cancel functions to topbar