Refactored right clicking on interfaces