fix track add for new navigation; fix add track -> cancel; use topbar