Login menu - code cleanup, fix for shortcodes already loaded, v2 template path added