polish front end a bit