adding some styling
merge with master