max class limit & color fix