cleaned up choices code and fixed bug from step navigator
cleaned up choices code and fixed bug from step navigator