try to fix merge errors
#78 fix db communication fix merge errors
#80 try to make frontend more pretty