Remove a couple more id selectors in favour of classes