Working on #27 to improve the top menu and de-flatten it, etc.