Final commit, small color and layout changes