Fixed database

Cleaned up database and forms