Issue #49. Styling fixes