Updated a ton of database changes and added new schema, minor changes to layout design