Bit more styling and selection work