Modified database entries to fit mpampis' request.

Gui yet needs some modifications to be more beautiful.