UI refinement, bugfixing