CSS Fix & Cleanup