Rework layout a bit and add number of states to view as an option