Minor update to tempates and graphics