Few UI improvement and fix