Added menu loop.
Fixed ordering of menu prompt.