Updated db model
Updated Bootstrap
Minor refactoring