Clean up templates to work with new Oscar structure