Bit more tweaking to make the selection tabs work.