Various improvements for better inheritance

Improvements to add show and hide triggers and some other improvements
to the event naming to allow for better inheritance.

Added close icon functionality.