Added more front-end features