Added states view, minor changes