Adjusting spacing, tidying up CSS