Fixed templates and views to accomodate new style