A bunch of front end fixes