Adding front-end changes