Fixed override bug with hybrids
Cleaned up html and css