study mode now loops through cards forward forever

Also made a minor change in Controller to make code look nicer.