Front-end Changes