State lines are there and color is changed. Closes #1
Merge branch 'dev' because it distinguish state lines and change colors.