Minor employee/user template tweaks
final employee fixes