Cosmetic improvements
First server version with database