Updated models and tables to create the proper tables in the html