Issue #16. Styling fixes