CSS Fix & Clean up code