Improvements to front-end