various fix to refine UI, logic, display issues;