rearranging css file a little to group similar styles together