Made a couple of front-end changes