twitter and topbar updates
fixed up merging errors
Merge pull request #8 from danlinde/twitter_style

Twitter_style