added color coding, new grid system