More CSS work, more major HTML cleanup