payroll UI change + bugfixes