Initial styling + changes

Sorry - big commit!