Incorporated Emily's front end changes