fixing front-end to be consistent