Reorder and rename menu items
Rename template
Small UX changes and cosmetic adjustments