Moved search controller into navbar controller