Removing most index specs, resigning search keyboard
Removed unused controls, misc cleanup