Huge cleanup to CSS and theme