Fixes menu and improves TA template.