Levels rearranged/axed and extra controller type added