Update database with cross-listed field
Update database

Clean up foreign keys by removing unnecessary ones
Update database and picture