Issue #408 - Fixing styles