Lots of changes, mostly menu related