[!!!][FEATURE] Refactor and streamline click menu / context menu