Little markup and style changes. Fix #1