Fixes some refactoring / menu issues