Minor improvements (also a typo).
Moved the menu into the base frame. (Why haven't I put it there to begin
with?)
Bugfix