Front-end improvements