Website improvements
Database refactoring