Cleaned up some stuff
Removed menu item layout changed, because of issues that need fixing first.