Commit with some front end changes