Fit bugfix, improvement and context menu implementation