Added user menu. Bug correction from previous commit
Add remove choices (and some cleanup)