merge laura branch with frontend branch

make css and html consistent