Tab order and error handling updates