UI refinements and tiny bug fixes