Fixed several bugs, finished front-end
left a place for improvement on backend