Issue #476 - Fixing styling