Finished input validation and focus issues