Improved context menu & bugfixes