Re-styling and re-organising pretty much everything