UI improvement and safety features