several front end improvement