UI convergence + bug fixes