Table layout now also for Menu templates, plus small bugfix.