small changes to topbar to repair the enter funktionality
conflicts resolved