Major update to front end