More styling & color coding polish