moved context menu to reusable component + bugfixes