fixed templates and added style