cleanup of old selectors and working on grid style