Major revisions to CSS, need to clean it up