* Made show/hide always work properly
* Scoped some style changes
* Overall template cleanup, such as stripping of unnecessary HTML code