menu controller + some fixes