! combine the same selectors, fix look as well

Signed-off-by: Spuds <spuds@spudsdesign.com>