added names
modifed frontend + removed db