JSF Cleanup & UI bug treatments