Small changes

Changed code formating to my liking. Tried to add number index to menu.
Needs testing.