Styling revamp

Resolves #6, #16