Style tweaks. Fixing padding and formatting