UI Updates and refinement