More small styling fixes and refinements