added some more styling
merged josh into master