Fixed backend and worked a bit on front end