restructured some code to catch invalid menu selections (as of now)

Signed-off-by: Alexander Skjolden <alex@plastboks.net>