css reorganization, html cleanup