Upgraded DB models and cleaned front end slightly