Develop

Belated pull into master. All the updated styling