Working version of top-toolbar, bufix, no tests