Merge Oli's dev with new slides

CSS Merged from my work and new CSS for slides by David.