Fixed some of the front-end bugs.