change color class names + better layouting for partition