...and removed generic menu wrapper