Revised design
Yet more design revisions, and set up Angular