Fixing class usage, changing more colors and css