Change menu to make more dynamic.

Have testet that the program is not affected by my changes