Clean up search bar behavior and add support for ios 8 size classes