Several CSS revert and clean up