Some reorganising of styles, fixing style for inline <code>, closes #1307
Fixing typo