Just changed the look and feel to match the system if possible, and displayed better error messages