Issue #214 - Fixing styling