Lots of front end changes