Minor employee/user template tweaks
final employee fixes
Merge pull request #572 from einhverfr/1.4

more UI fixes