cleaning up user templates; broke options out into separate file