templates reordered, cleaned up and user request setting changed