some re-formatting on the server, plus updates to front-end