Menu and code improvements

all objects will be part of the same inheritance structure soon