JSF Cleanup & UI bug treatments (+ add back in files left out of initial
git commits)