Theme and Template updates

Updating structure of template and theming.