CSS classes cleaned up, templates simplified: