Moved all menu related items to a new class