Front-end changes