case 2784 - Change order of items in search box. Other minor changes.