Globalization, addition of error message and fixed navigation