added right click support
more components support