Some refactoring, Menu gui changes.