fixed the front end to make more compatible with the back end