Working version of menu, minor changes to ADT's