Style tweaks, refactoring
Spacing, sizing tweaks