Many changes, mostly done create menu