huge updates to front-end