Added valid states, so we only see accepted, delivered and finished stories

also fixed some formatting issues