Changed tables in database

Fixed conflicts on table section