UI improvement and fixes