Changed the way tabs are done, all validation is working correctly