Add some basic menu structure, fix some small issues.