rearranged templates, url and menus