Cleanup.

Code reorganization, CSS changes.