Fix and clean up styles

Fixes #1236 and other alignment bugs