Fixed a couple front end bugs