Tidying up my CSS, using ids where appropriate