get rid of div element selectors
further cleanup, rules rearrange