add basic styling
merge with master