Added rest of the front-end changes