RAVE-389: Applying skin and necessary template changes. Fixes to original template to work with said template changes.