and even moar menu stuff ;)