Added events mixin
Cleanup HTML structure and CSS