colors fixed, panels added