Reworked selector css/layout