added right click keyboard shortcuts and spacer/border